10.0.7 class changes